merge trunk
authorKenichi Handa <handa@m17n.org>
Tue, 20 Sep 2011 04:39:47 +0000 (13:39 +0900)
committerKenichi Handa <handa@m17n.org>
Tue, 20 Sep 2011 04:39:47 +0000 (13:39 +0900)
commite0ebf48332dcee7913d98e1ace38f9ceb5ea63f2
treecf6202d3bcc260848eb9627a2cba20a04b40806c
parent7508eb806ca72d6174a5f3bbcbe008fe64c63ce3
parent5f7b0d3e5f461a51bef8e82dee55ffa7b5e71287
merge trunk